merge trunk
authorK. Handa <handa@gnu.org>
Sun, 8 Sep 2013 12:08:36 +0000 (21:08 +0900)
committerK. Handa <handa@gnu.org>
Sun, 8 Sep 2013 12:08:36 +0000 (21:08 +0900)
commitc4588838b95b6369c5388a41e829a9a8a8e09609
treebbf06fb81aae867b87788f51dc569eae9d7428a9
parentbd936dbfb7c0ba8fa5c254fbef63c7506126b35f
parent3c5e9ebca6a62f7eb2d5f13f17cfd2e9564fabb8
merge trunk